From 072f06abf713d7536ce2a84a5ac266f585c88d39 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 8 Dec 2017 17:48:47 -0500 Subject: [PATCH] Fix fallout from g_object_ref change g_object_ref now returns the type of the object that was passed. Introduce cast as necessary to avoid warnings due to this. --- gtk/a11y/gtklabelaccessible.c | 2 +- gtk/a11y/gtktreeviewaccessible.c | 4 ++-- gtk/gtkcellrendererspin.c | 3 ++- gtk/gtkcolorplane.c | 2 +- gtk/gtkcomboboxtext.c | 2 +- gtk/gtkcssimagefallback.c | 2 +- gtk/gtklabel.c | 2 +- gtk/gtksidebarrow.c | 4 ++-- gtk/gtktoolpalette.c | 2 +- gtk/gtktreeview.c | 2 +- gtk/gtkwidget.c | 2 +- modules/printbackends/cups/gtkprintbackendcups.c | 2 +- tests/testentrycompletion.c | 2 +- 13 files changed, 16 insertions(+), 15 deletions(-) diff --git a/gtk/a11y/gtklabelaccessible.c b/gtk/a11y/gtklabelaccessible.c index 0cdb6e0c58..91b1ac861d 100644 --- a/gtk/a11y/gtklabelaccessible.c +++ b/gtk/a11y/gtklabelaccessible.c @@ -84,7 +84,7 @@ gtk_label_accessible_link_impl_get_hyperlink (AtkHyperlinkImpl *atk_impl) { GtkLabelAccessibleLinkImpl *impl = (GtkLabelAccessibleLinkImpl *)atk_impl; - return g_object_ref (impl->link); + return (AtkHyperlink *)g_object_ref (impl->link); } static void diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c index 3a184e749d..05629a06e3 100644 --- a/gtk/a11y/gtktreeviewaccessible.c +++ b/gtk/a11y/gtktreeviewaccessible.c @@ -469,7 +469,7 @@ gtk_tree_view_accessible_ref_child (AtkObject *obj, if (cell == NULL) cell = create_cell (tree_view, accessible, tree, node, tv_col); - return g_object_ref (cell); + return (AtkObject *) g_object_ref (cell); } static AtkStateSet* @@ -562,7 +562,7 @@ gtk_tree_view_accessible_ref_accessible_at_point (AtkComponent *component, if (cell == NULL) cell = create_cell (tree_view, GTK_TREE_VIEW_ACCESSIBLE (component), tree, node, column); - return g_object_ref (cell); + return (AtkObject *) g_object_ref (cell); } static void diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c index 5fa0cae35b..6f67a8b5fc 100644 --- a/gtk/gtkcellrendererspin.c +++ b/gtk/gtkcellrendererspin.c @@ -227,7 +227,8 @@ gtk_cell_renderer_spin_set_property (GObject *object, } if (obj) - priv->adjustment = g_object_ref_sink (obj); + priv->adjustment = GTK_ADJUSTMENT (g_object_ref_sink (obj)); + break; case PROP_CLIMB_RATE: priv->climb_rate = g_value_get_double (value); diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c index af0cede140..221664c3be 100644 --- a/gtk/gtkcolorplane.c +++ b/gtk/gtkcolorplane.c @@ -459,7 +459,7 @@ plane_set_property (GObject *object, GParamSpec *pspec) { GtkColorPlane *plane = GTK_COLOR_PLANE (object); - GObject *adjustment; + GtkAdjustment *adjustment; /* Construct only properties can only be set once, these are created * only in order to be properly buildable from gtkcoloreditor.ui diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c index 4b15c04028..f03ebbabc7 100644 --- a/gtk/gtkcomboboxtext.c +++ b/gtk/gtkcomboboxtext.c @@ -292,7 +292,7 @@ gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable *buildable, data = g_slice_new0 (ItemParserData); data->builder = g_object_ref (builder); - data->object = g_object_ref (buildable); + data->object = (GObject *) g_object_ref (buildable); data->domain = gtk_builder_get_translation_domain (builder); data->string = g_string_new (""); diff --git a/gtk/gtkcssimagefallback.c b/gtk/gtkcssimagefallback.c index afc5aef779..7bd310c855 100644 --- a/gtk/gtkcssimagefallback.c +++ b/gtk/gtkcssimagefallback.c @@ -176,7 +176,7 @@ gtk_css_image_fallback_compute (GtkCssImage *image, return GTK_CSS_IMAGE (copy); } else - return g_object_ref (fallback); + return GTK_CSS_IMAGE (g_object_ref (fallback)); } static gboolean diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index ca5576c106..f66cefe510 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -1623,7 +1623,7 @@ gtk_label_buildable_custom_tag_start (GtkBuildable *buildable, parser_data = g_slice_new0 (PangoParserData); parser_data->builder = g_object_ref (builder); - parser_data->object = g_object_ref (buildable); + parser_data->object = (GObject *) g_object_ref (buildable); *parser = pango_parser; *data = parser_data; return TRUE; diff --git a/gtk/gtksidebarrow.c b/gtk/gtksidebarrow.c index d3a58bd30d..c03fe57f7b 100644 --- a/gtk/gtksidebarrow.c +++ b/gtk/gtksidebarrow.c @@ -225,7 +225,7 @@ gtk_sidebar_row_set_property (GObject *object, object = g_value_get_object (value); if (object != NULL) { - self->start_icon = g_object_ref (object); + self->start_icon = G_ICON (g_object_ref (object)); gtk_image_set_from_gicon (GTK_IMAGE (self->start_icon_widget), self->start_icon); } else @@ -241,7 +241,7 @@ gtk_sidebar_row_set_property (GObject *object, object = g_value_get_object (value); if (object != NULL) { - self->end_icon = g_object_ref (object); + self->end_icon = G_ICON (g_object_ref (object)); gtk_image_set_from_gicon (GTK_IMAGE (self->end_icon_widget), self->end_icon); gtk_widget_show (self->end_icon_widget); } diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c index 65e97d9d41..1d4a4b9771 100644 --- a/gtk/gtktoolpalette.c +++ b/gtk/gtktoolpalette.c @@ -693,7 +693,7 @@ gtk_tool_palette_add (GtkContainer *container, g_ptr_array_add (palette->priv->groups, info); info->pos = palette->priv->groups->len - 1; - info->widget = g_object_ref_sink (child); + info->widget = (GtkToolItemGroup *)g_object_ref_sink (child); gtk_widget_set_parent (child, GTK_WIDGET (palette)); } diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index fcc849bc2c..5146b0fc66 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -14233,7 +14233,7 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view, if (entry) { - tree_view->priv->search_entry = g_object_ref (entry); + tree_view->priv->search_entry = GTK_WIDGET (g_object_ref (entry)); tree_view->priv->search_custom_entry_set = TRUE; if (tree_view->priv->search_entry_changed_id == 0) diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 83d38efb8a..e88df80164 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -11924,7 +11924,7 @@ gtk_widget_buildable_custom_tag_start (GtkBuildable *buildable, AccelGroupParserData *data; data = g_slice_new0 (AccelGroupParserData); - data->object = g_object_ref (buildable); + data->object = (GObject *)g_object_ref (buildable); data->builder = builder; *parser = accel_group_parser; diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c index abc5f841c6..3751b2d8c0 100644 --- a/modules/printbackends/cups/gtkprintbackendcups.c +++ b/modules/printbackends/cups/gtkprintbackendcups.c @@ -3959,7 +3959,7 @@ cups_request_ppd (GtkPrinter *printer) g_io_channel_set_encoding (data->ppd_io, NULL, NULL); g_io_channel_set_close_on_unref (data->ppd_io, TRUE); - data->printer = g_object_ref (printer); + data->printer = (GtkPrinterCups *) g_object_ref (printer); resource = g_strdup_printf ("/printers/%s.ppd", gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer))); diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c index 332d6bef5f..ec1d2f6d68 100644 --- a/tests/testentrycompletion.c +++ b/tests/testentrycompletion.c @@ -233,7 +233,7 @@ animation_timer (GtkEntryCompletion *completion) { g_print ("removing model!\n"); - old_store = g_object_ref (gtk_entry_completion_get_model (completion)); + old_store = GTK_LIST_STORE (g_object_ref (gtk_entry_completion_get_model (completion))); gtk_entry_completion_set_model (completion, NULL); } else -- 2.30.2